Merge branch 'experimental'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 14 Sep 2012 23:40:09 +0000 (02:40 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 14 Sep 2012 23:40:09 +0000 (02:40 +0300)
commit98098ffd6150d3eb69fbfe33b444ef35d7be3e45
tree94ea77a037ed2f7a14d6a15df84715b5482b5ab4
parent1f64630ea3b0221f9e27ee6f547129e358d0305b
parent780c9780c8a90512986daa823a2e1cb44e72f591
Merge branch 'experimental'

Conflicts:
debian/changelog
debian/control
debian/libmgl-fltk5.symbols
debian/libmgl-qt5.symbols
debian/libmgl-wx5.symbols
debian/libmgl5.symbols
debian/patches/series
debian/patches/texinfo-Makefile.patch
debian/patches/texinfo-png-Makefile.patch
debian/source/options
lang/numpy.i.in
texinfo/Makefile.am
texinfo/Makefile.in
debian/changelog.orig
debian/control.orig
debian/patches/series.orig
debian/source/options.orig
lang/numpy.i.in.orig
texinfo/mathgl_en.texi
texinfo/mathgl_ru.texi
texinfo/mgl_en.texi
texinfo/mgl_ru.texi